From: Dan Winship <danw@gnome.org>
Date: Tue, 11 May 2010 18:46:26 +0000 (-0400)
Subject: St: fix allocation to not use both wfh and hfw
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10100
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=74ccdbf3a9c7ecc9ee08d439df144ccb2e7a142d;p=gnome-shell.git

St: fix allocation to not use both wfh and hfw

Passing an explicit width in the wfh case or a height in the hfw case
messes up the request caching, and confuses actors that assume they
won't be called with an explicit width/height unless they're being
allocated along the other axis.

https://bugzilla.gnome.org/show_bug.cgi?id=618295
---

diff --git a/src/st/st-private.c b/src/st/st-private.c
index 7586e2b79..dd64cb889 100644
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -155,7 +155,7 @@ _st_allocate_fill (StWidget        *parent,
 
   if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
     {
-      clutter_actor_get_preferred_width (child, available_height,
+      clutter_actor_get_preferred_width (child, -1,
                                          &min_width,
                                          &natural_width);
 
@@ -169,7 +169,7 @@ _st_allocate_fill (StWidget        *parent,
     }
   else
     {
-      clutter_actor_get_preferred_height (child, available_width,
+      clutter_actor_get_preferred_height (child, -1,
                                           &min_height,
                                           &natural_height);